x86/compat: correct SMEP/SMAP NOPs patching
authorJan Beulich <jbeulich@suse.com>
Thu, 26 May 2016 16:26:24 +0000 (17:26 +0100)
committerWei Liu <wei.liu2@citrix.com>
Thu, 26 May 2016 16:26:24 +0000 (17:26 +0100)
commitf5610009529628314c9d1d52b00715fe855fcf06
tree92f37fdfccdd074c61530ab64ae67490fb00fede
parent663f2f51b10e55a9093a0bc458dadfbaf1705c31
x86/compat: correct SMEP/SMAP NOPs patching

Correct the number of single byte NOPs we want to be replaced in case
neither SMEP nor SMAP are available.

Also simplify the expression adding these NOPs - at that location .
equals .Lcr4_orig, and removing that part of the expression fixes a
bogus ".space or fill with negative value, ignored" warning by very old
gas (which actually is what made me look at those constructs again).

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
xen/arch/x86/x86_64/compat/entry.S